From a4deb7e7b44868aa578714eb63b102e406462b4e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Oct 2017 00:18:21 -0400 Subject: [PATCH] Reshuffle the css tests a bit --- testsuite/css/api.test.in | 2 +- testsuite/css/meson.build | 8 ++------ testsuite/css/nodes/meson.build | 7 ++----- testsuite/css/nodes/test-css-nodes.test.in | 2 +- testsuite/css/parser/meson.build | 6 ++---- testsuite/css/parser/test-css-parser.test.in | 2 +- testsuite/css/style/meson.build | 6 ++---- testsuite/css/style/test-css-style.test.in | 2 +- testsuite/meson.build | 5 +++-- 9 files changed, 15 insertions(+), 25 deletions(-) diff --git a/testsuite/css/api.test.in b/testsuite/css/api.test.in index 13bba4d6c9..3823e9e6bf 100644 --- a/testsuite/css/api.test.in +++ b/testsuite/css/api.test.in @@ -1,3 +1,3 @@ [Test] -Exec=@libexecdir@/installed-tests/gtk+/css/api +Exec=@libexecdir@/installed-tests/gtk-4.0/css/api Type=session diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build index e3f6fb385a..5df0da85cd 100644 --- a/testsuite/css/meson.build +++ b/testsuite/css/meson.build @@ -2,13 +2,9 @@ subdir('parser') subdir('nodes') subdir('style') -gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) -testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4') -testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css') - test_api = executable('api', 'api.c', install: get_option('install-tests'), - install_dir: testexecdir, + install_dir: join_paths(installed_test_bindir, 'css'), dependencies: libgtk_dep) test('css/api', test_api) @@ -18,6 +14,6 @@ if get_option('install-tests') configure_file(input: 'api.test.in', output: 'api.test', configuration: conf, - install_dir: testdatadir) + install_dir: installed_test_datadir) endif diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build index 55dab8d72d..e0f63b75d5 100644 --- a/testsuite/css/nodes/meson.build +++ b/testsuite/css/nodes/meson.build @@ -1,7 +1,4 @@ -gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) -testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4') -testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css/nodes') - +testexecdir = join_paths(installed_test_bindir, 'css', 'nodes') test_nodes = executable('test-css-nodes', 'test-css-nodes.c', install: get_option('install-tests'), install_dir: testexecdir, @@ -71,7 +68,7 @@ if get_option('install-tests') configure_file(input: 'test-css-nodes.test.in', output: 'test-css-nodes.test', configuration: conf, - install_dir: testdatadir) + install_dir: installed_test_datadir) install_data(test_data, install_dir: testexecdir) diff --git a/testsuite/css/nodes/test-css-nodes.test.in b/testsuite/css/nodes/test-css-nodes.test.in index 98c1cc1962..1687ba2dbf 100644 --- a/testsuite/css/nodes/test-css-nodes.test.in +++ b/testsuite/css/nodes/test-css-nodes.test.in @@ -1,4 +1,4 @@ [Test] -Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && @libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes --tap" +Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/nodes && @libexecdir@/installed-tests/gtk-4.0/css/nodes/test-css-nodes --tap" Type=session Output=TAP diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build index 7163686f09..ef953f999a 100644 --- a/testsuite/css/parser/meson.build +++ b/testsuite/css/parser/meson.build @@ -1,6 +1,4 @@ -gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) -testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4') -testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css/parser') +testexecdir = join_paths(installed_test_bindir, 'css', 'parser') test_parser = executable('test-css-parser', 'test-css-parser.c', install: get_option('install-tests'), @@ -457,7 +455,7 @@ if get_option('install-tests') configure_file(input: 'test-css-parser.test.in', output: 'test-css-parser.test', configuration: conf, - install_dir: testdatadir) + install_dir: installed_test_datadir) install_data(test_data, install_dir: testexecdir) diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in index 132944d10d..9f36f2a005 100644 --- a/testsuite/css/parser/test-css-parser.test.in +++ b/testsuite/css/parser/test-css-parser.test.in @@ -1,4 +1,4 @@ [Test] -Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser --tap" +Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/parser && @libexecdir@/installed-tests/gtk-4.0/css/parser/test-css-parser --tap" Type=session Output=TAP diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build index 6ef4b98960..0554aad1d5 100644 --- a/testsuite/css/style/meson.build +++ b/testsuite/css/style/meson.build @@ -1,6 +1,4 @@ -gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) -testdatadir = join_paths(gtk_datadir, 'installed-tests/gtk4') -testexecdir = join_paths(gtk_libexecdir, 'installed-tests/gtk4/css/style') +testexecdir = join_paths(installed_test_bindir, 'css', 'style') cssresources = gnome.compile_resources( 'cssresources', @@ -52,7 +50,7 @@ if get_option('install-tests') configure_file(input: 'test-css-style.test.in', output: 'test-css-style.test', configuration: conf, - install_dir: testdatadir) + install_dir: installed_test_datadir) install_data(test_data, install_dir: testexecdir) diff --git a/testsuite/css/style/test-css-style.test.in b/testsuite/css/style/test-css-style.test.in index c36aa00635..daeb3641cb 100644 --- a/testsuite/css/style/test-css-style.test.in +++ b/testsuite/css/style/test-css-style.test.in @@ -1,4 +1,4 @@ [Test] -Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && @libexecdir@/installed-tests/gtk+/css/style/test-css-style --tap" +Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/style && @libexecdir@/installed-tests/gtk-4.0/css/style/test-css-style --tap" Type=session Output=TAP diff --git a/testsuite/meson.build b/testsuite/meson.build index f2bba2b424..f9b97da586 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -1,5 +1,6 @@ -installed_test_bindir = join_paths(get_option('libexecdir'), 'installed-tests', 'gtk-4.0') -installed_test_datadir = join_paths(get_option('datadir'), 'installed-tests', 'gtk-4.0') +gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir')) +installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk-4.0') +installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk-4.0') installed_test_env = [ 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), -- 2.30.2